some basic changes, probably isn't the best solution but looks kind of ok for now