style fixes & first components