Made layout changes and added a little functionality