Fixed padding and FF issues