fixed layout and logic for following-settings, cleaned up