Minor changes to fix styles
resolved merge conflicts
Fixed widget styles
latest activity update