made button layout a tad more theme-independent