Settings added and views moved into admin