updated version
some layout adjustments