some minor fixes
minor code and layout fixes