Misc cleanup and added demo screens