Added title text and moved some buttons around to make things easier to read and a bit more intuitive