Updated allignment and go back button - Yunnie