Added settings. Needs work on layout