css stuff and added buttons
fixed conflict