Tweaked functionality and design

As the commit title says!