Added Settings activity
Fixed Settings toolbar