added some style and sort