Fixed UI as per @scottlow's OCD