added div for settings
merged from master