fixing float buttons
fixing layout issues