Fixed design and small buggs