Project structure and minor UI issues