finished some more changes
updated some styles