changed design and added button functionality
fixed conflicts