fixing up some layout incorrectness