Implemented arrange and fixed feature