redesigned button/layout