fixed bugs changed layout