some layout adjustments
some layout