diff --git a/docs/api/methods/index.md b/docs/api/methods/index.md
index 3ded69b5..58bfd230 100644
--- a/docs/api/methods/index.md
+++ b/docs/api/methods/index.md
@@ -1,77 +1,79 @@
 # Methods
 
 Here is list of all available API methods:
-* Getting updates
- - [getUpdates](get_updates.md)
- - [setWebhook](set_webhook.md)
- - [deleteWebhook](delete_webhook.md)
- - [getWebhookInfo](get_webhook_info.md)
-* Available methods
- - [getMe](get_me.md)
- - [sendMessage](send_message.md)
- - [forwardMessage](forward_message.md)
- - [sendPhoto](send_photo.md)
- - [sendAudio](send_audio.md)
- - [sendDocument](send_document.md)
- - [sendVideo](send_video.md)
- - [sendAnimation](send_animation.md)
- - [sendVoice](send_voice.md)
- - [sendVideoNote](send_video_note.md)
- - [sendMediaGroup](send_media_group.md)
- - [sendLocation](send_location.md)
- - [editMessageLiveLocation](edit_message_live_location.md)
- - [stopMessageLiveLocation](stop_message_live_location.md)
- - [sendVenue](send_venue.md)
- - [sendContact](send_contact.md)
- - [sendPoll](send_poll.md)
- - [sendChatAction](send_chat_action.md)
- - [getUserProfilePhotos](get_user_profile_photos.md)
- - [getFile](get_file.md)
- - [kickChatMember](kick_chat_member.md)
- - [unbanChatMember](unban_chat_member.md)
- - [restrictChatMember](restrict_chat_member.md)
- - [promoteChatMember](promote_chat_member.md)
- - [setChatAdministratorCustomTitle](set_chat_administrator_custom_title.md)
- - [setChatPermissions](set_chat_permissions.md)
- - [exportChatInviteLink](export_chat_invite_link.md)
- - [setChatPhoto](set_chat_photo.md)
- - [deleteChatPhoto](delete_chat_photo.md)
- - [setChatTitle](set_chat_title.md)
- - [setChatDescription](set_chat_description.md)
- - [pinChatMessage](pin_chat_message.md)
- - [unpinChatMessage](unpin_chat_message.md)
- - [leaveChat](leave_chat.md)
- - [getChat](get_chat.md)
- - [getChatAdministrators](get_chat_administrators.md)
- - [getChatMembersCount](get_chat_members_count.md)
- - [getChatMember](get_chat_member.md)
- - [setChatStickerSet](set_chat_sticker_set.md)
- - [deleteChatStickerSet](delete_chat_sticker_set.md)
- - [answerCallbackQuery](answer_callback_query.md)
-* Updating messages
- - [editMessageText](edit_message_text.md)
- - [editMessageCaption](edit_message_caption.md)
- - [editMessageMedia](edit_message_media.md)
- - [editMessageReplyMarkup](edit_message_reply_markup.md)
- - [stopPoll](stop_poll.md)
- - [deleteMessage](delete_message.md)
-* Stickers
- - [sendSticker](send_sticker.md)
- - [getStickerSet](get_sticker_set.md)
- - [uploadStickerFile](upload_sticker_file.md)
- - [createNewStickerSet](create_new_sticker_set.md)
- - [addStickerToSet](add_sticker_to_set.md)
- - [setStickerPositionInSet](set_sticker_position_in_set.md)
- - [deleteStickerFromSet](delete_sticker_from_set.md)
-* Inline mode
- - [answerInlineQuery](answer_inline_query.md)
-* Payments
- - [sendInvoice](send_invoice.md)
- - [answerShippingQuery](answer_shipping_query.md)
- - [answerPreCheckoutQuery](answer_pre_checkout_query.md)
-* Telegram Passport
- - [setPassportDataErrors](set_passport_data_errors.md)
-* Games
- - [sendGame](send_game.md)
- - [setGameScore](set_game_score.md)
- - [getGameHighScores](get_game_high_scores.md)
+
+
+- Getting updates
+    - [getUpdates](get_updates.md)
+    - [setWebhook](set_webhook.md)
+    - [deleteWebhook](delete_webhook.md)
+    - [getWebhookInfo](get_webhook_info.md)
+- Available methods
+    - [getMe](get_me.md)
+    - [sendMessage](send_message.md)
+    - [forwardMessage](forward_message.md)
+    - [sendPhoto](send_photo.md)
+    - [sendAudio](send_audio.md)
+    - [sendDocument](send_document.md)
+    - [sendVideo](send_video.md)
+    - [sendAnimation](send_animation.md)
+    - [sendVoice](send_voice.md)
+    - [sendVideoNote](send_video_note.md)
+    - [sendMediaGroup](send_media_group.md)
+    - [sendLocation](send_location.md)
+    - [editMessageLiveLocation](edit_message_live_location.md)
+    - [stopMessageLiveLocation](stop_message_live_location.md)
+    - [sendVenue](send_venue.md)
+    - [sendContact](send_contact.md)
+    - [sendPoll](send_poll.md)
+    - [sendChatAction](send_chat_action.md)
+    - [getUserProfilePhotos](get_user_profile_photos.md)
+    - [getFile](get_file.md)
+    - [kickChatMember](kick_chat_member.md)
+    - [unbanChatMember](unban_chat_member.md)
+    - [restrictChatMember](restrict_chat_member.md)
+    - [promoteChatMember](promote_chat_member.md)
+    - [setChatAdministratorCustomTitle](set_chat_administrator_custom_title.md)
+    - [setChatPermissions](set_chat_permissions.md)
+    - [exportChatInviteLink](export_chat_invite_link.md)
+    - [setChatPhoto](set_chat_photo.md)
+    - [deleteChatPhoto](delete_chat_photo.md)
+    - [setChatTitle](set_chat_title.md)
+    - [setChatDescription](set_chat_description.md)
+    - [pinChatMessage](pin_chat_message.md)
+    - [unpinChatMessage](unpin_chat_message.md)
+    - [leaveChat](leave_chat.md)
+    - [getChat](get_chat.md)
+    - [getChatAdministrators](get_chat_administrators.md)
+    - [getChatMembersCount](get_chat_members_count.md)
+    - [getChatMember](get_chat_member.md)
+    - [setChatStickerSet](set_chat_sticker_set.md)
+    - [deleteChatStickerSet](delete_chat_sticker_set.md)
+    - [answerCallbackQuery](answer_callback_query.md)
+- Updating messages
+    - [editMessageText](edit_message_text.md)
+    - [editMessageCaption](edit_message_caption.md)
+    - [editMessageMedia](edit_message_media.md)
+    - [editMessageReplyMarkup](edit_message_reply_markup.md)
+    - [stopPoll](stop_poll.md)
+    - [deleteMessage](delete_message.md)
+- Stickers
+    - [sendSticker](send_sticker.md)
+    - [getStickerSet](get_sticker_set.md)
+    - [uploadStickerFile](upload_sticker_file.md)
+    - [createNewStickerSet](create_new_sticker_set.md)
+    - [addStickerToSet](add_sticker_to_set.md)
+    - [setStickerPositionInSet](set_sticker_position_in_set.md)
+    - [deleteStickerFromSet](delete_sticker_from_set.md)
+- Inline mode
+    - [answerInlineQuery](answer_inline_query.md)
+- Payments
+    - [sendInvoice](send_invoice.md)
+    - [answerShippingQuery](answer_shipping_query.md)
+    - [answerPreCheckoutQuery](answer_pre_checkout_query.md)
+- Telegram Passport
+    - [setPassportDataErrors](set_passport_data_errors.md)
+- Games
+    - [sendGame](send_game.md)
+    - [setGameScore](set_game_score.md)
+    - [getGameHighScores](get_game_high_scores.md)
diff --git a/docs/api/types/index.md b/docs/api/types/index.md
index a981b10f..3b43ad2f 100644
--- a/docs/api/types/index.md
+++ b/docs/api/types/index.md
@@ -1,69 +1,109 @@
-# Methods
+# Types
 
-Here is list of all available API methods:
-* Getting updates
- - [Update](update.md)
- - [WebhookInfo](webhook_info.md)
-* Available methods
-* Updating messages
-* Stickers
- - [Sticker](sticker.md)
- - [StickerSet](sticker_set.md)
- - [MaskPosition](mask_position.md)
-* Inline mode
- - [InlineQuery](inline_query.md)
- - [InlineQueryResult](inline_query_result.md)
- - [InlineQueryResultArticle](inline_query_result_article.md)
- - [InlineQueryResultPhoto](inline_query_result_photo.md)
- - [InlineQueryResultGif](inline_query_result_gif.md)
- - [InlineQueryResultMpeg4Gif](inline_query_result_mpeg4_gif.md)
- - [InlineQueryResultVideo](inline_query_result_video.md)
- - [InlineQueryResultAudio](inline_query_result_audio.md)
- - [InlineQueryResultVoice](inline_query_result_voice.md)
- - [InlineQueryResultDocument](inline_query_result_document.md)
- - [InlineQueryResultLocation](inline_query_result_location.md)
- - [InlineQueryResultVenue](inline_query_result_venue.md)
- - [InlineQueryResultContact](inline_query_result_contact.md)
- - [InlineQueryResultGame](inline_query_result_game.md)
- - [InlineQueryResultCachedPhoto](inline_query_result_cached_photo.md)
- - [InlineQueryResultCachedGif](inline_query_result_cached_gif.md)
- - [InlineQueryResultCachedMpeg4Gif](inline_query_result_cached_mpeg4_gif.md)
- - [InlineQueryResultCachedSticker](inline_query_result_cached_sticker.md)
- - [InlineQueryResultCachedDocument](inline_query_result_cached_document.md)
- - [InlineQueryResultCachedVideo](inline_query_result_cached_video.md)
- - [InlineQueryResultCachedVoice](inline_query_result_cached_voice.md)
- - [InlineQueryResultCachedAudio](inline_query_result_cached_audio.md)
- - [InputMessageContent](input_message_content.md)
- - [InputTextMessageContent](input_text_message_content.md)
- - [InputLocationMessageContent](input_location_message_content.md)
- - [InputVenueMessageContent](input_venue_message_content.md)
- - [InputContactMessageContent](input_contact_message_content.md)
- - [ChosenInlineResult](chosen_inline_result.md)
-* Payments
- - [LabeledPrice](labeled_price.md)
- - [Invoice](invoice.md)
- - [ShippingAddress](shipping_address.md)
- - [OrderInfo](order_info.md)
- - [ShippingOption](shipping_option.md)
- - [SuccessfulPayment](successful_payment.md)
- - [ShippingQuery](shipping_query.md)
- - [PreCheckoutQuery](pre_checkout_query.md)
-* Telegram Passport
- - [PassportData](passport_data.md)
- - [PassportFile](passport_file.md)
- - [EncryptedPassportElement](encrypted_passport_element.md)
- - [EncryptedCredentials](encrypted_credentials.md)
- - [PassportElementError](passport_element_error.md)
- - [PassportElementErrorDataField](passport_element_error_data_field.md)
- - [PassportElementErrorFrontSide](passport_element_error_front_side.md)
- - [PassportElementErrorReverseSide](passport_element_error_reverse_side.md)
- - [PassportElementErrorSelfie](passport_element_error_selfie.md)
- - [PassportElementErrorFile](passport_element_error_file.md)
- - [PassportElementErrorFiles](passport_element_error_files.md)
- - [PassportElementErrorTranslationFile](passport_element_error_translation_file.md)
- - [PassportElementErrorTranslationFiles](passport_element_error_translation_files.md)
- - [PassportElementErrorUnspecified](passport_element_error_unspecified.md)
-* Games
- - [Game](game.md)
- - [CallbackGame](callback_game.md)
- - [GameHighScore](game_high_score.md)
+Here is list of all available API types:
+
+
+- Getting updates
+    - [Update](update.md)
+    - [WebhookInfo](webhook_info.md)
+- Available types
+    - [User](user.md)
+    - [Chat](chat.md)
+    - [Message](message.md)
+    - [MessageEntity](message_entity.md)
+    - [PhotoSize](photo_size.md)
+    - [Audio](audio.md)
+    - [Document](document.md)
+    - [Video](video.md)
+    - [Animation](animation.md)
+    - [Voice](voice.md)
+    - [VideoNote](video_note.md)
+    - [Contact](contact.md)
+    - [Location](location.md)
+    - [Venue](venue.md)
+    - [PollOption](poll_option.md)
+    - [PollAnswer](poll_answer.md)
+    - [Poll](poll.md)
+    - [UserProfilePhotos](user_profile_photos.md)
+    - [File](file.md)
+    - [ReplyKeyboardMarkup](reply_keyboard_markup.md)
+    - [KeyboardButton](keyboard_button.md)
+    - [KeyboardButtonPollType](keyboard_button_poll_type.md)
+    - [ReplyKeyboardRemove](reply_keyboard_remove.md)
+    - [InlineKeyboardMarkup](inline_keyboard_markup.md)
+    - [InlineKeyboardButton](inline_keyboard_button.md)
+    - [LoginUrl](login_url.md)
+    - [CallbackQuery](callback_query.md)
+    - [ForceReply](force_reply.md)
+    - [ChatPhoto](chat_photo.md)
+    - [ChatMember](chat_member.md)
+    - [ChatPermissions](chat_permissions.md)
+    - [ResponseParameters](response_parameters.md)
+    - [InputMedia](input_media.md)
+    - [InputMediaPhoto](input_media_photo.md)
+    - [InputMediaVideo](input_media_video.md)
+    - [InputMediaAnimation](input_media_animation.md)
+    - [InputMediaAudio](input_media_audio.md)
+    - [InputMediaDocument](input_media_document.md)
+    - [InputFile](input_file.md)
+- Stickers
+    - [Sticker](sticker.md)
+    - [StickerSet](sticker_set.md)
+    - [MaskPosition](mask_position.md)
+- Inline mode
+    - [InlineQuery](inline_query.md)
+    - [InlineQueryResult](inline_query_result.md)
+    - [InlineQueryResultArticle](inline_query_result_article.md)
+    - [InlineQueryResultPhoto](inline_query_result_photo.md)
+    - [InlineQueryResultGif](inline_query_result_gif.md)
+    - [InlineQueryResultMpeg4Gif](inline_query_result_mpeg4_gif.md)
+    - [InlineQueryResultVideo](inline_query_result_video.md)
+    - [InlineQueryResultAudio](inline_query_result_audio.md)
+    - [InlineQueryResultVoice](inline_query_result_voice.md)
+    - [InlineQueryResultDocument](inline_query_result_document.md)
+    - [InlineQueryResultLocation](inline_query_result_location.md)
+    - [InlineQueryResultVenue](inline_query_result_venue.md)
+    - [InlineQueryResultContact](inline_query_result_contact.md)
+    - [InlineQueryResultGame](inline_query_result_game.md)
+    - [InlineQueryResultCachedPhoto](inline_query_result_cached_photo.md)
+    - [InlineQueryResultCachedGif](inline_query_result_cached_gif.md)
+    - [InlineQueryResultCachedMpeg4Gif](inline_query_result_cached_mpeg4_gif.md)
+    - [InlineQueryResultCachedSticker](inline_query_result_cached_sticker.md)
+    - [InlineQueryResultCachedDocument](inline_query_result_cached_document.md)
+    - [InlineQueryResultCachedVideo](inline_query_result_cached_video.md)
+    - [InlineQueryResultCachedVoice](inline_query_result_cached_voice.md)
+    - [InlineQueryResultCachedAudio](inline_query_result_cached_audio.md)
+    - [InputMessageContent](input_message_content.md)
+    - [InputTextMessageContent](input_text_message_content.md)
+    - [InputLocationMessageContent](input_location_message_content.md)
+    - [InputVenueMessageContent](input_venue_message_content.md)
+    - [InputContactMessageContent](input_contact_message_content.md)
+    - [ChosenInlineResult](chosen_inline_result.md)
+- Payments
+    - [LabeledPrice](labeled_price.md)
+    - [Invoice](invoice.md)
+    - [ShippingAddress](shipping_address.md)
+    - [OrderInfo](order_info.md)
+    - [ShippingOption](shipping_option.md)
+    - [SuccessfulPayment](successful_payment.md)
+    - [ShippingQuery](shipping_query.md)
+    - [PreCheckoutQuery](pre_checkout_query.md)
+- Telegram Passport
+    - [PassportData](passport_data.md)
+    - [PassportFile](passport_file.md)
+    - [EncryptedPassportElement](encrypted_passport_element.md)
+    - [EncryptedCredentials](encrypted_credentials.md)
+    - [PassportElementError](passport_element_error.md)
+    - [PassportElementErrorDataField](passport_element_error_data_field.md)
+    - [PassportElementErrorFrontSide](passport_element_error_front_side.md)
+    - [PassportElementErrorReverseSide](passport_element_error_reverse_side.md)
+    - [PassportElementErrorSelfie](passport_element_error_selfie.md)
+    - [PassportElementErrorFile](passport_element_error_file.md)
+    - [PassportElementErrorFiles](passport_element_error_files.md)
+    - [PassportElementErrorTranslationFile](passport_element_error_translation_file.md)
+    - [PassportElementErrorTranslationFiles](passport_element_error_translation_files.md)
+    - [PassportElementErrorUnspecified](passport_element_error_unspecified.md)
+- Games
+    - [Game](game.md)
+    - [CallbackGame](callback_game.md)
+    - [GameHighScore](game_high_score.md)
diff --git a/mkdocs.yml b/mkdocs.yml
index 51bb1905..f3b5f44d 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -42,6 +42,7 @@ nav:
   - Bot API:
       - api/index.md
       - Methods:
+          - Overview: api/methods/index.md
           - Getting updates:
               - api/methods/get_updates.md
               - api/methods/set_webhook.md
@@ -117,6 +118,7 @@ nav:
               - api/methods/set_game_score.md
               - api/methods/get_game_high_scores.md
       - Types:
+          - Overview: api/types/index.md
           - Getting updates:
               - api/types/update.md
               - api/types/webhook_info.md