Added button style and carried over border issues