Restructured. Added auth on UI