Fixed issue with buttons
Fixed issue with permissions & new desing