working on new look and feel - Badly