Working on formatting UI