Improved layout and interface