Merged admin files, created custom styles