Updated look and feel completely
Fixed conficts