some more styling mess
Merge remote-tracking branch 'Xerkus/feature/tweaks'