Improved Layout see #6