Added more settings, changed the view a bit.
Almost ready