Cleaned up the construction menu and fixed a couple of bugs.

Fixes #422