Make layout prettier and bug fixes

Make layout prettier and fix bug on loading custom attributes