Done some restructuring and tiny tiny UI things. Also created Settings activity.