fix : margin-bottom & broadcast
todo & minor changes