switched branching and worked on look and feel