Changed layout and added button images