Working on settings bar and pop-ups. Small tweaks.