12-5-2014 some layout issue fixes