minor bug fixes with layout