updated ugly file
fixed the conflicts
added a new panel to the site and special shit