Big restructure of the whole system and fixed admin casos