Cleanup & sligthly refactor home
Prepare upload for Ajax + cleanup
Really fix route collision