Addded basic settings functionality