Some more cleaning and UX improvements...
Signed-off-by: Antes <antes@simplemachines.org>