Updated structure, CSS and Settings