v1.0.1 Re-layout