Added settings menu, tweaks