changed home page layout so things make more sense and everything's much neater; merged into master