Attempt to clean layout

ToDo:
-> Pagination (10 per page)
-> Add Archive / Completed