Even nicer layout in profiles
Updated version