New layout should look better now