Visuals/bunch of changes

@Lynngre that will fix issue [#191]