Bug fix, design tweaks
Restyle