some font and alignment stuff
fixing conflict
bubble fixes
fixed padding