new stuff after testing, new button layout