More dock view refactoring, got rid of magic numbers in favor of magic constants