Updated layout a bit, added buttons