removed glassbutton template and fixed a few layout issues