Finished making things pretty. Should be good until a rewrite