mostly edit ui changes. HAHAHAHA PUSHING TO MASTER