changed overall look
fix
some optimization
more tweaks