UI modification according to Mike's requirements