Removed reliance of TML, button styling