Fix bugs & update layout