Improved buttons displaying