Added dividers, small fixes