Added some buttons and some labels