Don't need defines anymore
Layout fixes
More layout changes
Latest versions