more OC6 firendly UI
Merge pull request #30 from bastho/master

more OC6 firendly UI