fixed bug and layout issue