Layout changes and add new button