I liked the minimalist style and having different weapons, but I agree that switching between modes felt clunky.
True, I'll fix it (by providing hot key for mode switch)