diff --git a/src/components/Pagination.vue b/src/components/Pagination.vue
index 833cfd5..0342805 100644
--- a/src/components/Pagination.vue
+++ b/src/components/Pagination.vue
@@ -1,65 +1,70 @@
 <template lang="pug">
 	.Pagination
 		.Pagination__container
 			WTLButton(
 				:disabled="current_page <= 1"
 				@click="fetchPage(current_page-1)"
 			) Pagina precedente
+			.Pagination__current-page Pagina {{ current_page }} / {{ last_page }}
 			WTLButton(
 				:disabled="current_page >= last_page"
 				@click="fetchPage(current_page+1)"
 			) Pagina successiva
 </template>
 
 <script>
 import WTLButton from "components/ui/WTLButton"
 
 export default {
 	props: {
 		resource: {
 			type: String,
 			required: true
 		},
 		page: {
 			type: Number
 		},
 		last_page: {
 			type: Number,
 			required: true
 		}
 	},
 	components: { WTLButton },
 	data() {
 		return {
 			current_page: this.page ? this.page : 1
 		}
 	},
 	methods: {
 		fetchPage(page) {
 			this.current_page = page
 			let data = this.$store.dispatch(`FETCH_${this.resource}S`, { page: page })
 				.catch((error) => {
 					console.log(error)
 					return this.$store.commit("SET_ERROR", { error: error })
 				})
 			this.$emit("update", data)
 		}
 	}
 }
 </script>
 
 <style lang="scss">
 @import "~styles/_variables";
 
 .Pagination {
 	display: flex;
 	justify-content: center;
 
 	&__container {
 		display: flex;
 		justify-content: center;
-		border: 1px solid $lightgray;
-		background-color: white;
+		align-items: center;
+	}
+
+	&__current-page {
+		align-self: center;
+		padding: 1rem;
 	}
 }
 </style>
diff --git a/src/views/Courses.vue b/src/views/Courses.vue
index fc5c2c7..f95d67b 100644
--- a/src/views/Courses.vue
+++ b/src/views/Courses.vue
@@ -1,93 +1,95 @@
 <template lang="pug">
 	div
 		h1.view--Courses__title Corsi disponibili
 		.view--Courses__container
 			div.view--Course__item(
 				v-for="course in courses"
 				:key="course._id"
 			)
 				Badge(:link=`{
 					view: "Course",
 					title: course.title,
 					params: {
 						courseName: course._id
 					}
 				}`)
 		Error(:error="error")
 		Pagination(
 			resource="COURSE"
-			:page="page"
 			:last_page="lastPage"
 		)
 </template>
 
 <style lang="scss">
 .view--Courses__title {
 	text-align: center;
 	margin-bottom: 1rem;
 }
 
 .view--Courses__container {
 	display: flex;
 	flex-wrap: wrap;
 }
 </style>
 
 <script>
 import Pagination from "components/Pagination"
 import Badge from "components/home/Badge"
 import ErrorHandler from "mixins/errorHandler"
 import WTLButton from "components/ui/WTLButton"
 
 export default {
 	name: "Course",
 	mixins: [ErrorHandler],
 	components: { WTLButton, Badge, Pagination },
 	data() {
 		return {
 			page: 1
 		}
 	},
 	computed: {
 		courses() {
 			return this.$store.state.courses
 		},
 		coursesMeta() {
 			return this.$store.state.meta
 		},
 		lastPage() {
+			if (this.coursesMeta.total === 0) {
+				return 1
+			}
 			let page = parseInt(this.coursesMeta.total / this.coursesMeta.max_results)
 			if (this.coursesMeta.total % this.coursesMeta.max_results > 0) {
 				page += 1
 			}
 			return page
 		}/* ,
 		links() {
 			return this.$store.state.navigationLinks
 		}*/
 	},
 	asyncData({ store, route }) {
 		return store.dispatch("FETCH_COURSES", { page: 1 })
 			.catch((error) => {
 				console.log(error)
 				return store.commit("SET_ERROR", { error: error })
 			})
 	},
 	methods: {
 		fetchCoursesPage(page) {
 			this.page = page
 			return this.$store.dispatch("FETCH_COURSES", { page: page })
 				.catch((error) => {
 					console.log(error)
 					return this.$store.commit("SET_ERROR", { error: error })
 				})
 		}
 	},
 	meta() {
 		return {
 			title: "Courses",
 			description: "This is the meta description for the courses list page"
 		}
 	}
 }
 </script>