Remake general layout and homepage