fixed the state button on view issue, fixed some other small esthetic problems.