Final versions of everything. Still need to clean up duplicate controls