Fixed settings layout, bug fixes for email to HR