Fixed Minor Frontend (Also Minor Spacing)

Yeah... I know... Priorities.