Fixed border, added custom user