Merge with choi

update styles
placeholder for IE