attempting major ui changes