Logic started, UI polished