fix css issues and button click propagation issues, restyle