ui cleanup and file re-organizing