some layout adjustments
updated version