More ui cleanup + added new function buttons but disabled