lots of change

add, remove buttons
Layout Changes