rendering classes -> moving forward
some cleaning in GUI