Layout & UI cleanup