Some layout and style enhancements