Added button border
Fixed some stuff