Various Changes

Change file structure, add small css and html edits