restructure & cleaning up home page