moar styling an rework