spruced up UI and added refueling capabilities
Merge origin/master