remove gen/
Code and UI clean up