Some more work for a better styling