cleaned up UI and added functionality to limit number of skips
resolving merge conflict