Layout improvments

2 working buttons Exit and Add