Added functionality

Settings page and functionality finished