solved some findbugs issues.
added substancial look and feel.