Added border. Needs finishing touches