last changes in style, and functionality

Signed-off-by: franszo <franszo.design@gmail.com>