stylign mostly
solved conflicts in styling