Button Fixed and some design tweaks