Cleaned up default layout a bit.