Scanner UI simplified

I also did a bit of project cleanup so that things a bit more organized