styling fixes and first steps in maintaining state