changes in UI
fix bugs
Merge pull request #30 from BrandyMint/fixbugs_02_07_2013

Fixbugs 02.07.2013