Fix some bug and layout