Some changes of layout and effects