design work + some js and bugs fixed