Cleaned up formatting, added button helpers