Cleaned some code, added buttons

Buttons are in test mode, they ad a row but no content yet