Removed extra column and moved elements around UI just for housekeeping