Fixed empty list display & some styles