improved some items and layout