Layout cleaned up