various padding and layout adjustement.