Added a seperator, fixed layout issues