Removed debug borders and finalized prototype