UI/layout changes for easier use