refactored layout a bit