code clean up, initial launch with new layout