Made the UI slighty more user friendly