Made some significant changes to styling (and structure)