added buttons and bgs
merged