Finalise Entity CSS styling. Restructure app.

Final touches to custom CSS styling for Entities. Tidy up source and
re-organise Entity Factory usage.