Updated parameters so it fits better.
Add validations of input
Make border slimmer