Added explicit check for serializable extra
Tweak to layout to improve spacing