Completed UI changes as per Trello