Generally beautyfied the UI