polished the look and the code, resolved remaining issues