large ui overhaul and layout decisions for prototype