This should give GitX some more consistency. Also, it will give us a basis to build further changes on.